Large Type fixes

Addresses the things described in #1804.