Started fixing Java Warnings