Addressing a couple of old issues, prep for equality change