Fixes after Simon's review.