continued bug fixes (#1862)