fixes for repair