Made changes for JDK 1.7