diff --git a/android/app/build.gradle b/android/app/build.gradle
index 16960d54..e18e8ae5 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.hmg.hmgDr"
-        minSdkVersion 18
+        minSdkVersion 21
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 4bbbd40e..eb946dea 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
 const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
-const BASE_URL = 'https://hmgwebservices.com/';
-// const BASE_URL = 'https://uat.hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
 const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
diff --git a/lib/screens/live_care/end_call_screen.dart b/lib/screens/live_care/end_call_screen.dart
index 83a2d0f5..b7383703 100644
--- a/lib/screens/live_care/end_call_screen.dart
+++ b/lib/screens/live_care/end_call_screen.dart
@@ -65,7 +65,7 @@ class _EndCallScreenState extends State<EndCallScreen> {
                 kSessionId: liveCareModel.startCallRes.openSessionID,
                 kApiKey: '46209962',
                 vcId: widget.patient.vcId,
-                patientName: widget.patient.fullName ?? widget.patient.firstName != null ? "${widget.patient.firstName} ${widget.patient.lastName}" : "-",
+                patientName: widget.patient.fullName ?? (widget.patient.firstName != null ? "${widget.patient.firstName} ${widget.patient.lastName}" : "-"),
                 tokenID: await liveCareModel.getToken(),
                 generalId: GENERAL_ID,
                 doctorId: liveCareModel.doctorProfile.doctorID,
diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
index 69bbb97a..298e7d18 100644
--- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
+++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
@@ -327,7 +327,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
                                    kSessionId: model.startCallRes.openSessionID,
                                    kApiKey: '46209962',
                                    vcId: patient.vcId,
-                                   patientName: patient.fullName ?? patient.firstName != null ? "${patient.firstName} ${patient.lastName}" : "-",
+                                   patientName: patient.fullName ?? (patient.firstName != null ? "${patient.firstName} ${patient.lastName}" : "-"),
                                    tokenID: await model.getToken(),
                                    generalId: GENERAL_ID,
                                    doctorId: model.doctorProfile.doctorID,