Add .NET 3.5 project; tidied directives; .NET 3.5 fixes