Update to remove all of the package inconsistancies