Even More Type Fixes