Minor changes for installation and first save.