Domain check fixes for wp7
Merge branch 'BETA'