Fixed some compile errors on Mac platforms
Merge branch 'experimental' of marcusbannerman.co.uk:dynamo into experimental