Warning fixes
Warning fixes