BF: small fixes