Fix a couple of high priority findbugs issues.

Could this be replaced with trim?

@scoen