FIX: small corrections