A few other tweaks