Trailing space fixes should allow for less improper strings