Minor fixes for Matterhorn