thematic plan fixes