Various asset import bug fixes