fixes by PR