Fix some bugs from Mrs Hang