fix root key setter trigger order
small cleanups