Bugfixes, next beta release