fixing some issues with guest