reapply internal modifiers to some types
fix some issues introduced to access when I removed the static lookups