Yet more Francois treats + Fixes