PMO-2838: minor improvements