Disambiguate some options, fix #96