Refactor - fix warnings compilation.