Last tweaks wrt #614