Fixes after new round of review