fixes for lower versions of AMT
added support of other incoming messages