WIP/DNM: fixes from SCA

Please do not merge ... WIP