Some improvements to "Fix missing spaces" - thx Joel :)