mas-gcrma-fixes