Some warning fixes