Try fixing some weirdness