Minor compatibility fixes for bootstrap_psexec