Merge pull request #577 from tguilbert-google/small_changes

Small non-functional changes