Warning fixes

Warning fixes.