Fix dll/service creation
Land #2660, DLL/service creation for x64