Some fixes after latest BC break.