Again some warnings fix.
Merge