fixes made during integration