fixed a few things to A3

Change-Id: I7a1c5bcb4b55af97b9427d41332c559be15745d8