Fixes for aacgain and bcpp