3_5 changes compile good

Signed-off-by: aLekSer <gdocse@gmail.com>
5_5 done

Signed-off-by: aLekSer <gdocse@gmail.com>
some changes 2, 3