Fixing a few breakages