More fixes to prevent update.exe shortcut creation