Fixed: small fixes