Fixes to support Windows Store