Bug #10, Fixes to my commits following Martin's pull of #10 [LACE]