bug fixes for HPC