FIX: small fixes