Fixing a few more warnings