More guards for idempotence and nova set up