Bugfixes and updates