Fix some bug under local