Finish up cleaning out the warnings