removed some errors related to jdk7