Student fix some bugs