Fixed Service Discovery Issues
More reverting of x86 issues