Minor tweaks from Francis's amends
Latest compiled versions