Fixes for ABF2 format, more forthcoming