Fixed more integration bugs