Fixes after reviews