[#866923] Some bug fixes.