#2585 and #2626 fix suggested by Jon.

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