Fixed java 1.6 errors