Hopefully fix the last of the weirdness.