RunAsAdmin fixes and integration