Cleaning up some warnings