[3649] [3630] Fix some remaining issues with the new architecture

[3649] [3630] Fix some remaining issues with the new architecture #15778