Fixed stupid NULL-terminator issues