misc warning fixes