Fix some more warnings