A number of fixes that Dean wanted before presenting.

See for more details:
https://discoverygarden.atlassian.net/browse/EMIC-148

Didn't have enough time for pretty printing.