debris fixes