Spot fixes to merge issues and spaces