Minor fixes, bump version to 0.0.18