Fixes by PR