Fixes for accelerate