Fixes after feedback.