WIP: Some fixes

Do not merge yet ... work in progress.