Fix build partially