A few small tweaks