A20

Fixes for A20 support