A few more warnings squashed