Some 2.11 warning fixes