Minor and temporary fixes to FeatureMapper components