Fixing Warnings, Java 7