Fixes by jk