Got rid of a few more Java warnings