rejig paths for our fork