Some fixes to the latest draft