Fixed JDK6 Build errors