Cleaning up some warnings
Fixing some warnings