Fixes by PR comments