Adaptations so that switching to 40 target framework causes no issues
Merge pull request #568 from flq/adaptation_net40

Adaptations so that switching to 40 target framework causes no issues