and some more fixes (engine dependency seems to work :D)