Warnings fixed
Merge