Fix remainder of the issues Simon reported