diff --git a/alignment/dnaseqalign.sh b/alignment/dnaseqalign.sh
index ffa99c473ba1a0588583188813609fde8757dae4..219f7f822c4cfd2f14c4287c73ba241f88342113 100644
--- a/alignment/dnaseqalign.sh
+++ b/alignment/dnaseqalign.sh
@@ -12,7 +12,7 @@ usage() {
   exit 1
 }
 OPTIND=1 # Reset OPTIND
-while getopts :r:x:y:p:u:h opt
+while getopts :r:x:y:p:uh opt
 do
     case $opt in
         r) index_path=$OPTARG;;
diff --git a/alignment/rnaseqalign.sh b/alignment/rnaseqalign.sh
index ecee18b7cf487948ceaf32d2ab18e68ef5278ed4..49ffadfd4c9bb7fada1b6255949017d849028532 100644
--- a/alignment/rnaseqalign.sh
+++ b/alignment/rnaseqalign.sh
@@ -34,7 +34,7 @@ if [[ -z $pair_id ]] || [[ -z $fq1 ]]; then
 fi
 
 source /etc/profile.d/modules.sh
-module load  samtools/gcc/1.6 picard/2.10.3
+module load  samtools/1.6 picard/2.10.3
 baseDir="`dirname \"$0\"`"
 if [[ -z $SLURM_CPUS_ON_NODE ]]
 then
@@ -62,13 +62,14 @@ else
     else
 	hisat2 -p $SLURM_CPUS_ON_NODE --rg-id ${pair_id} --rg LB:tx --rg PL:illumina --rg PU:barcode --rg SM:${pair_id} --add-chrname --no-unal --dta -x ${index_path}/hisat_index/genome -U $fq1 -S out.sam --summary-file ${pair_id}.alignerout.txt
     fi
-    samtools view -1 --threads $SLURM_CPUS_ON_NODE -o output.bam out.sam
-fi
-if [[ $umi==1 ]]
-then
-    python ${baseDir}/add_umi_bam.py -b output.bam -o output.unsort2.bam
-    mv output.unsort2.bam output.bam
+    if [[ $umi==1 ]]
+    then
+	python ${baseDir}/add_umi_sam.py -s out.sam -o output.bam
+    else
+	samtools view -1 --threads $SLURM_CPUS_ON_NODE -o output.bam out.sam
+    fi
 fi
+
 samtools sort -@ $SLURM_CPUS_ON_NODE -O BAM -n -o  output.nsort.bam output.bam
 java -jar $PICARD/picard.jar FixMateInformation ASSUME_SORTED=TRUE SORT_ORDER=coordinate ADD_MATE_CIGAR=TRUE I=output.nsort.bam O=${pair_id}.bam
 samtools index -@ $SLURM_CPUS_ON_NODE ${pair_id}.bam
diff --git a/variants/cnvkit.sh b/variants/cnvkit.sh
index d4ba922c136de31ea9d0b8440f558cca0d55e312..40b72185e46627dae8078e28777608c3e83b9453 100644
--- a/variants/cnvkit.sh
+++ b/variants/cnvkit.sh
@@ -21,6 +21,8 @@ done
 
 shift $(($OPTIND -1))
 
+index_path='/project/shared/bicf_workflow_ref/GRCh38/clinseq_prj/'
+
 # Check for mandatory options
 if [[ -z $pair_id ]] || [[ -z $sbam ]]; then
     usage
@@ -33,13 +35,13 @@ baseDir="`dirname \"$0\"`"
 
 source /etc/profile.d/modules.sh
 module load cnvkit/0.9.0
-cnvkit.py coverage ${sbam} /project/shared/bicf_workflow_ref/GRCh38/UTSWV2.cnvkit_targets.bed -o ${pair_id}.targetcoverage.cnn
-cnvkit.py coverage ${sbam} /project/shared/bicf_workflow_ref/GRCh38/UTSWV2.cnvkit_antitargets.bed -o ${pair_id}.antitargetcoverage.cnn
+cnvkit.py coverage ${sbam} ${index_path}/UTSWV2.cnvkit_targets.bed -o ${pair_id}.targetcoverage.cnn
+cnvkit.py coverage ${sbam} ${index_path}/UTSWV2.cnvkit_antitargets.bed -o ${pair_id}.antitargetcoverage.cnn
 if [[ $umi == 'umi' ]]
 then
-cnvkit.py fix ${pair_id}.targetcoverage.cnn ${pair_id}.antitargetcoverage.cnn /project/shared/bicf_workflow_ref/GRCh38/UTSWV2.uminormals.cnn -o ${pair_id}.cnr
+cnvkit.py fix ${pair_id}.targetcoverage.cnn ${pair_id}.antitargetcoverage.cnn ${index_path}/UTSWV2.uminormals.cnn -o ${pair_id}.cnr
 else
-cnvkit.py fix ${pair_id}.targetcoverage.cnn ${pair_id}.antitargetcoverage.cnn /project/shared/bicf_workflow_ref/GRCh38/UTSWV2.normals.cnn -o ${pair_id}.cnr
+cnvkit.py fix ${pair_id}.targetcoverage.cnn ${pair_id}.antitargetcoverage.cnn ${index_path}/UTSWV2.normals.cnn -o ${pair_id}.cnr
 fi   
 
 cnvkit.py segment ${pair_id}.cnr -o ${pair_id}.cns