Fix some weirdness