More small tweaks