Minnor tweaks