Merge "Fix some const-ness and comments"