General and A10 fixes.