* Fixed some AMW regressions.