Fixing tabs and spaces