Fix: minor bugs
T_T