Minor tweaks
Fixed merge conflict