A few more warning fixes