Fix to http://jira.diamond.ac.uk/browse/SCI-1613
Fix to http://jira.diamond.ac.uk/browse/SCI-1603
Fix to http://jira.diamond.ac.uk/browse/SCI-1593