Various fixes to ensure PatientView 2 migration compatibility, updated to 1-4-7-RELEASE