More workarounds on reload-after-install