Removed some redundant \0 string terminators