few minor patches