Some A10 and A20 fixes.