Autoclose removed, some fixe