Some warning fixes
Small size fixes