Fixes after review comments