Replaced simple java 7 dependencies with java 6 equivalents