A few fixes as per Lars' review