Fixes after third review