Further changes needed to get the local mirror working.