TypeOf Fixes