Fixed some things that show up as warnings in Eclipse