more fixes, now we're down to 29 fails :-)