Fixing few error message issues