changes to make the projects build in a default java 1.7 environment