Fixing some error messages