Fixed missed changes that weren't caught by the unit tests