Marc: More nimbus changes