Fix some of Simon's comments