Integration tools, bugfixes