Fixes to bugs detected by Rob
Merge branch 'icefaces18' of https://github.com/jintrone/XCoLab into icefaces18