Integration fixes