Remove 386 style and add some other changes