more fixes by xisco