CB-5066: dealing with windows8 issues