Bugfixes and updates for future releases