Fix bugs, push 0.9.4