0.0.17

Changes from test failures