diff --git a/packages/at_location_flutter/lib/location_modal/location_data_model.dart b/packages/at_location_flutter/lib/location_modal/location_data_model.dart
index 30732ab75..8706d05cb 100644
--- a/packages/at_location_flutter/lib/location_modal/location_data_model.dart
+++ b/packages/at_location_flutter/lib/location_modal/location_data_model.dart
@@ -90,8 +90,8 @@ class LocationSharingFor {
 
   Map<String, dynamic> toJson() {
     return {
-      'from': from != null ? from!.toUtc().toString() : null,
-      'to': to != null ? to!.toUtc().toString() : null,
+      'from': from?.toUtc().toString(),
+      'to': to?.toUtc().toString(),
       'locationSharingType': locationSharingType.toString(),
       'isAccepted': isAccepted.toString(),
       'isExited': isExited.toString(),
diff --git a/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart b/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart
index db34bfcdd..c81e3a994 100644
--- a/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart
+++ b/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart
@@ -1279,7 +1279,7 @@ class Coords<T extends num> extends CustomPoint<T> {
   String toString() => 'Coords($x, $y, $z)';
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (other is Coords) {
       return x == other.x && y == other.y && z == other.z;
     }