minor fixes to work on cluster