Bugfixes and performance improvements