Minor tweaks
Fix conflicts