More fixing of white-space