Some more amq tweaks.