Bugfixes with Integration