[0.0.41m] Applied Type Safety Fixes