Remove a few more warnings