Fixed some more java warnings