- Fixed couple of buffer overflows