[Olena-patches] milena r1390: Fix on tree for compiling, and Fix in fllt