Registry Diploma fixes