Couple small tweaks