[#84] Fix some bugs