Cleaning up more warnings