Fixed small typo
Some small fixes for Java 7
Type fixes for JDK7