Make setup more idempotent