various integration bugfixes