Fix minor integration bugs