more little fixes to push to cluster