Fixing some of the warnings