Make build java 6 compatible again