More gatk script bug fixes