some fixes, again