Removing hippo and other fixes