Guides tweaks