Grip: small fixes