Merge "Fix warnings" into lmp-dev