Fix Errors Pt 2