One more batch - spaces tweak.  Arggg