continued bug fixes (#1876)