Fixed 3 errors