Fix warnings
Merge