Simple: small tweaks