Fixes after first review