fix integration issues