2 warning fixes