Fixes for the preliminary review