Merge "Fix warnings" into tm-dev