Fixed another portion of errors