remove App dependency from KeyUtils & various fixes