Some consistency fixes
v0.0.6