diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b0c7024af..eff6570ec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,12 @@ jobs:
           environment-file: environment-dev.yml
           python-version: ${{ matrix.python }}
           miniconda-version: "latest"
-        
+
+      - name: Install Conda GCC
+        if: runner.os == 'Linux'
+        run: |
+          conda install -y -c conda-forge gcc gxx
+
       - name: Install Helios
         run: |
           python -m pip install -v .
diff --git a/README.md b/README.md
index 3c031abdd..8abfe40aa 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,11 @@ git clone https://github.com/3dgeo-heidelberg/helios.git
 cd helios
 conda env create -f environment-dev.yml
 conda activate helios-dev
+
+# On Linux, the following line is recommended, to go with a Conda-provided compiler.
+# We had issues with incompatible system compilers before.
+conda install -c conda-forge gcc gxx
+
 python -m pip install --no-deps -v -e .
 ```
 
diff --git a/python/pyhelios/data/scanners_tls.xml b/python/pyhelios/data/scanners_tls.xml
index c5301d3f1..ba3448b27 100644
--- a/python/pyhelios/data/scanners_tls.xml
+++ b/python/pyhelios/data/scanners_tls.xml
@@ -109,7 +109,7 @@
 
 
 	<!-- ##### BEGIN Velodyne VLP-16 ("Puck") ##### -->
-	<!-- for the angles and corrections, see https://velodynelidar.com/wp-content/uploads/2019/12/63-9243-Rev-E-VLP-16-User-Manual.pdf, page 54) -->
+	<!-- for the angles and corrections, see https://www.amtechs.co.jp/product/VLP-16-Puck.pdf) -->
 
 	<scanner 	id 						= "vlp16"
 			accuracy_m					= "0.03"
@@ -117,19 +117,19 @@
 			name              			= "Velodyne VLP-16"
 			optics            			= "rotating"
 			pulseFreqs_Hz				= "18750"
-			pulseLength_ns     			= "4"
-			rangeMin_m					= "0.0100"
+			pulseLength_ns     			= "5"
+			rangeMin_m					= "0.09144"
 			rangeMax_m					= "100"
 			scanAngleMax_deg   			= "1"
 			scanAngleEffectiveMax_deg	= "1"
 			scanFreqMin_Hz				= "0"
 			scanFreqMax_Hz				= "0"
-			wavelength_nm				= "903"
+			wavelength_nm				= "905"
             maxNOR                      = "2"
 			headRotatePerSecMax_deg		= "7200"
 	>
 				
-		<FWFSettings beamSampleQuality="1"/>	<!-- set to one for fast simulations -->
+		<FWFSettings beamSampleQuality="3"/>	<!-- set to one for fast simulations -->
 		<channels>
 			<channel id="0">
 				<beamOrigin x="0" y="0" z="0">
@@ -224,14 +224,14 @@
 			name              			= "Velodyne HDL-64E"
 			optics            			= "rotating"
 			pulseFreqs_Hz				= "20312"
-			pulseLength_ns     			= "10"
-			rangeMin_m					= "0.0100"
+			pulseLength_ns     			= "5"
+			rangeMin_m					= "0.9144"
 			rangeMax_m					= "120"
 			scanAngleMax_deg   			= "1"
 			scanAngleEffectiveMax_deg	= "1"
 			scanFreqMin_Hz				= "0"
 			scanFreqMax_Hz				= "0"
-			wavelength_nm				= "903"
+			wavelength_nm				= "905"
             maxNOR                      = "1"
 			headRotatePerSecMax_deg		= "5250"
 	>
diff --git a/src/scene/dynamic/DynSequence.h b/src/scene/dynamic/DynSequence.h
index 98b829f50..bfc27fe24 100644
--- a/src/scene/dynamic/DynSequence.h
+++ b/src/scene/dynamic/DynSequence.h
@@ -205,7 +205,7 @@ class DynSequence {
      * @param id New identifier for the dynamic sequence
      * @see DynSequence::setId
      */
-    inline void setId(string const & id) const {this->id = id;}
+    inline void setId(string const & id) {this->id = id;}
     /**
      * @brief Get next identifier for the dynamic sequence
      * @return Identifier of next dynamic sequence