Fixing some more warnings