Cleaning up the warnings