Cleaning up some warnings/silly things.