Fixes after last review