Working on warnings and idempotency