Bug fixes and cleanup for combined mapping table.