Some bug fixes.
0.4.4