Made some toml-test failures pass