Fixed .Net 4 and XP support