Tweaks following directory changes