- some fixes in CreateDevice init