Some minor adaptions for Walter.