Fix some findbugs/IDEA inspection warnings
Merge pull request #24 from square/rice/code_inspections

Fix some findbugs/IDEA inspection warnings