fixes for lower versions of AMT