a few hot fixes, see commits