Improve amkiss/amhug