More fixes for AA. Still some problems