Fixed integration issues