Fix cleaning issues