Support Net40
More net40 tweaks