Fix slot P2 issues

WindowsAzure#2226
WindowsAzure#2227
WindowsAzure#2229