Fixes from failed Win8 submission