Merge bugfixes from remote branch