Fixes after comments