Fixed errors that arose from not checking the merged code.