Various fixes.
Merge branch 'master' of https://github.com/furious-luke/libhpc