Cleaning up a few basic warnings just to be safe