Fix warnings that came up with Java 7