Fixes for Repairer