fixed java 7 problems