[Olena-patches] milena r1090: Some fix for compiling