Fixes a few final type size things