Cleanup of a few java warnings