Fixed up errors that arose from not testing changes