some minor patches