Fix build x8