Some spaces fixes -refs #7107