Couple improvements towards issue#37