helpers: AM integration bug fixes

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>