PIM-2588: minor fixes

Just come from his last PR ;)