a few more tweaks
this should fix at least some tests