Fix compliance for java 1.6