PIM-2588: minor fixes