More SCA fixes