Removed Some errors