Various fixes : see TODO file changes for the list