A couple more compiler warnings squashed