Fixes varios, hlpr-mr, etc