Fixed some more warnings. Changed to Java SE 1.7