Fixes. Ready for tagging v0.2