Additions to the various fixes that are going