Multiple guide tweaks and fixes