Fixed some of the quality assurance errors