This resolved a number of errors