Merge small changes