Additional fix for ISSUE #162
Fixes for NET35 build