Some fixes. Swap A4-A6 register functionalities.