Various tweaks to parse SAA19