fix integration errors