Fix various issues.  See HISTORY