Warnings cleanup

Clean up some warnings highlighted by Eclipse.