Fixed 6 and 7 error messages