Fixing compartmentalization code and arguments for mapping code