fix bugs for release phase 1