Change to const version, part of adminKit2 migration, see #2 and #9