CLRTypes fixes