Fix serverstub and index