fixes to mapping