- fix some mapper targeting
- don't assume loadopt is present