Fix a bundle of niggling lunchtime issues.