Fixed some heap buffer overflow