Patch some side bugs.
0.5.1