Simon B: Fixes as per David Thompson's email.