Fix some weirdness.