Minor thematic adjustments