Fixes after next feedback session