Minor changes ahead of a full read through