Fixes for java 1.7