Various freemap/fixmypaths minor tweaks
Various freemap/fixmypaths minor tweaks