Magnum fixes
Keeping this as WIP in case I find anything more to fix in my review: https://its.cern.ch/jira/browse/OS-11059
Edited by Thomas George Hartland
Keeping this as WIP in case I find anything more to fix in my review: https://its.cern.ch/jira/browse/OS-11059