Updates to clean up some things