Remove some more warnings