Fix some bugs of RC2