Many guide fixes