Fix @ and some error messages