Minor fixes for A10.