Bugfixes and consistency