feature #1977: Fix various issues with the guestOS injection