Fixed issues with ACBv2