Bug fixes
Merge branch 'master' of https://github.com/benjaminfrot/DTC-OSTI-CANCER-A
Various bug fixes.