Re fix some weirdness