Fix create instance issues