Fixed issues that appeared after WindowsPhone scrolling issue fix.