Merges and bugfixes