Fixes by reviews