Resolved errors that weren't evident in previous commit as the original classes were instantiated