Fix silly bugs from Lint suggestion.