Minor changes starting import