Fix cleaning errors
