Variety of small options related bug fixes.