Build fixed, more guards for idempotence