Small fixes after real user testing