Fixes for wp8