Merge "Fix typos in previous bugfixes." into lmp-dev