#2016 - a few more Windows fixes

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@19966 b5f69653-2bf5-0310-8201-b0dafb8e1405
#2016 - fix build

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@19967 b5f69653-2bf5-0310-8201-b0dafb8e1405