Fix :dog: :shit: rubo- :guardsman: warnings (un-split hairs)