various fix, to get it running