Incident #19550 - a few small fixes