4.4: 3.0: Fix misc tweaks install