Some fixes in versions compatibility