Various fixes

Nice work !