[v6r10] Compatibility fix

Added also few more fixes.