And some fixes, again