minor integration bug fixes