Fixes to map table