diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt
index bf660256e..88070b885 100644
--- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt
+++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt
@@ -50,7 +50,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
         binding.chart1.setOnChartValueSelectedListener(this)
         binding.chart1.setRoundedBarRadius(50f)
 
-        binding.chart1.setDrawMarkerViews(true)
+        binding.chart1.isDrawMarkersEnabled = true
         binding.chart1.isDrawBarShadow = false
         binding.chart1.isDrawValueAboveBar = true
 
diff --git a/app/src/main/kotlin/info/appdev/chartexample/TimeLineActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/TimeLineActivity.kt
index 3da017b75..efef1553c 100644
--- a/app/src/main/kotlin/info/appdev/chartexample/TimeLineActivity.kt
+++ b/app/src/main/kotlin/info/appdev/chartexample/TimeLineActivity.kt
@@ -159,9 +159,9 @@ class TimeLineActivity : DemoBase() {
         withContext(Dispatchers.Default) {
             while (menuItemMove!!.isChecked) {
                 withContext(Dispatchers.Main) {
-                    binding.chart1.lineData.dataSets.get(0)?.let { set ->
-                        (set as LineDataSet).entries.moveFirstToLast()
-                        set.notifyDataChanged()
+                    binding.chart1.lineData.dataSets[0].apply {
+                        (this as LineDataSet).entries.moveFirstToLast()
+                        this.notifyDataChanged()
                         binding.chart1.lineData.notifyDataChanged()
                         binding.chart1.notifyDataSetChanged()
                         binding.chart1.invalidate()