fix guest problems