PMO-2689: minor fixes