Fix some erorrs