Fixes taken from NH lustre folder after he indicated it was needed, hopefully without missing anything
This should fix the mapping for 2 of the new modules + include a small fix to the number of boxes for the legacy mode
@v.friese please do not hesitate to merge without waiting for me if @n.herrmann approves it, it is probably required if we want to switch later in the WE to .rra only