Further A10 + additional fixes.