Merge "x86_64: Fix issues in entrypoints"