Final tweaks - installation should complete without errors now.