fixes in model export