Fixes by discussion and feedback