Fixes to allow more explicit mapping situations