AAA fixes #2