Fixes after the code review