More bug fixes to handle chains with no accepts