deref types in more places