Warning fixes

Some warning fixes.