Bug fixes + change to sv-ax