Fixes from latest SCA runs