Add some of the stubbed out features back to the x86 impl.