Small fixes. (Removing #define DEBUG that's causing some problmes)

Signed-off-by: PlutoniumHeart <zhitaoli.hust@gmail.com>