fr: small fixies