Fix wrong merge
Compilation warnings fixes