Fixing a couple more warnings