Few more warning fixes