Minor changes
Fixed merge