Consolidated minor code diffs, these will be refactored shortly into one class used by both wp7+wp8