some more warning fixes