some fixes that were when running on diffrent machine