Errors and delete fix