Smal fixes in v0.5.