Max's emailed fixes