More gcc 4.2 warning fixes