Merge and fixes