Fixes and Java 7.