Merges and fixes