several fixes to run on cluster