Fix matterhorn startup