A few warning fixes