Fixed some SAV parsing bugs