Fixes related to axiom, automation tests cases and jaggary support