Some minor patches