various fixes for ISIS file processing