Fix mappings so SHM is table aligned