diff --git a/validation/data_validator.cpp b/validation/data_validator.cpp
index 9498c4d4b5..d48370a47e 100644
--- a/validation/data_validator.cpp
+++ b/validation/data_validator.cpp
@@ -44,8 +44,8 @@
 
 DataValidator::DataValidator(DataValidator *prev_sibling) :
 	_error_mask(ERROR_FLAG_NO_ERROR),
-	_time_last(0),
 	_timeout_interval(20000),
+	_time_last(0),
 	_event_count(0),
 	_error_count(0),
 	_error_density(0),
diff --git a/validation/data_validator.h b/validation/data_validator.h
index 8120fa6010..356220c336 100644
--- a/validation/data_validator.h
+++ b/validation/data_validator.h
@@ -136,7 +136,14 @@ public:
 	 *
 	 * @param timeout_interval_us The timeout interval in microseconds
 	 */
-	void			set_timeout(uint64_t timeout_interval_us) { _timeout_interval = timeout_interval_us; }
+	void			set_timeout(uint32_t timeout_interval_us) { _timeout_interval = timeout_interval_us; }
+
+	/**
+	 * Get the timeout value
+	 *
+	 * @return The timeout interval in microseconds
+	 */
+	uint32_t			get_timeout() const { return _timeout_interval; }
 	
 	/**
 	 * Data validator error states 
@@ -150,8 +157,8 @@ public:
 
 private:
 	uint32_t _error_mask;			/**< sensor error state */
+	uint32_t _timeout_interval;		/**< interval in which the datastream times out in us */
 	uint64_t _time_last;			/**< last timestamp */
-	uint64_t _timeout_interval;		/**< interval in which the datastream times out in us */
 	uint64_t _event_count;			/**< total data counter */
 	uint64_t _error_count;			/**< error count */
 	int _error_density;			/**< ratio between successful reads and errors */
@@ -169,6 +176,6 @@ private:
 	static const constexpr unsigned VALUE_EQUAL_COUNT_MAX = 100;	/**< if the sensor value is the same (accumulated also between axes) this many times, flag it */
 
 	/* we don't want this class to be copied */
-	DataValidator(const DataValidator&);
-	DataValidator operator=(const DataValidator&);
+	DataValidator(const DataValidator&) = delete;
+	DataValidator operator=(const DataValidator&) = delete;
 };
diff --git a/validation/data_validator_group.cpp b/validation/data_validator_group.cpp
index 3f04180a77..ff545e432f 100644
--- a/validation/data_validator_group.cpp
+++ b/validation/data_validator_group.cpp
@@ -64,7 +64,7 @@ DataValidatorGroup::~DataValidatorGroup()
 }
 
 void
-DataValidatorGroup::set_timeout(uint64_t timeout_interval_us)
+DataValidatorGroup::set_timeout(uint32_t timeout_interval_us)
 {
 	DataValidator *next = _first;
 
diff --git a/validation/data_validator_group.h b/validation/data_validator_group.h
index dbc40f9ad9..65a9ee24c9 100644
--- a/validation/data_validator_group.h
+++ b/validation/data_validator_group.h
@@ -113,7 +113,7 @@ public:
 	 *
 	 * @param timeout_interval_us The timeout interval in microseconds
 	 */
-	void			set_timeout(uint64_t timeout_interval_us);
+	void			set_timeout(uint32_t timeout_interval_us);
 
 private:
 	DataValidator *_first;		/**< sibling in the group */