Merge bugfixes