diff --git a/repos/dde_linux/src/include/lx_emul/kernel.h b/repos/dde_linux/src/include/lx_emul/kernel.h
index 4c75d04666..39805ed692 100644
--- a/repos/dde_linux/src/include/lx_emul/kernel.h
+++ b/repos/dde_linux/src/include/lx_emul/kernel.h
@@ -110,7 +110,6 @@ static inline size_t min(size_t a, size_t b) {
 #define max(x, y) ({                      \
         typeof(x) _max1 = (x);                  \
         typeof(y) _max2 = (y);                  \
-        (void) (&_max1 == &_max2);              \
         _max1 > _max2 ? _max1 : _max2; })
 
 #define min_t(type, x, y) ({ \
diff --git a/repos/dde_linux/src/include/lx_kit/env.h b/repos/dde_linux/src/include/lx_kit/env.h
index 798aa7c4c6..b2adc721de 100644
--- a/repos/dde_linux/src/include/lx_kit/env.h
+++ b/repos/dde_linux/src/include/lx_kit/env.h
@@ -24,7 +24,7 @@ namespace Lx_kit {
 
 	Env &env();
 
-	void construct_env(Genode::Env &env);
+	Env &construct_env(Genode::Env &env);
 }
 
 class Lx_kit::Env
@@ -42,6 +42,8 @@ class Lx_kit::Env
 		Genode::Env                    &env()        { return _env; }
 		Genode::Heap                   &heap()       { return _heap; }
 		Genode::Attached_rom_dataspace &config_rom() { return _config; }
+		Genode::Ram_session            &ram()        { return _env.ram(); }
+		Genode::Region_map             &rm()         { return _env.rm(); }
 };
 
 #endif /* _LX_KIT__ENV_H_ */
diff --git a/repos/dde_linux/src/lx_kit/env.cc b/repos/dde_linux/src/lx_kit/env.cc
index f3dc970b65..2e3b20af99 100644
--- a/repos/dde_linux/src/lx_kit/env.cc
+++ b/repos/dde_linux/src/lx_kit/env.cc
@@ -25,7 +25,8 @@ Lx_kit::Env &Lx_kit::env()
 }
 
 
-void Lx_kit::construct_env(Genode::Env &env)
+Lx_kit::Env &Lx_kit::construct_env(Genode::Env &env)
 {
 	_env.construct(env);
+	return *_env;
 }