Simon B: Fixes as per Alex Torrance's email.