Merging and fixes