some fixes in engines