Manual fixes for prefix change