Fix some issues with SBC A, r