Merge and small changes