various warning fixes