[FIX] build fixes