Fix bugs for alpha 2 release