* Fixed some AMW issues