Upgraded to jdk 7u15 and 6u41