Type enforcement changes