a few minor patches