more fixes by ziggy