Make code java 1.7 compliant.