more fixes by Lauri.