few tweaks to reduce the probability of the installation to fail