more warning fixes