A few more path tweaks