Fixed some issues

Jashon Wan