Cleaning up Java compiler warnings

https://www.pivotaltracker.com/story/show/79276446