diff --git a/DStarGatewayConfig.cpp b/DStarGatewayConfig.cpp
index 77135d6..707cfd0 100644
--- a/DStarGatewayConfig.cpp
+++ b/DStarGatewayConfig.cpp
@@ -190,7 +190,7 @@ bool CDStarGatewayConfig::loadRepeaters(const Config & cfg)
 			// ???
 		}
 
-		if(get_value(cfg, key.str() + ".offset", repeater->offset, 0.0, 50.0, 0.0)) {
+		if(get_value(cfg, key.str() + ".offset", repeater->offset, -50.0, 50.0, 0.0)) {
 			// ???
 		}
 
@@ -309,7 +309,7 @@ bool CDStarGatewayConfig::loadGateway(const Config & cfg)
 	bool ret = get_value(cfg, "gateway.callsign", m_gateway.callsign, 3, 8, "");
 	get_value(cfg, "gateway.address", m_gateway.address, 0, 20, "0.0.0.0", true) && ret;
 	get_value(cfg, "gateway.hbAddress", m_gateway.hbAddress, 0, 20, "127.0.0.1", true) && ret;
-	get_value(cfg, "gateway.hbport", m_gateway.hbPort, 1U, 65535U, 20010U) && ret;
+	get_value(cfg, "gateway.hbPort", m_gateway.hbPort, 1U, 65535U, 20010U) && ret;
 	get_value(cfg, "gateway.icomAddress", m_gateway.icomAddress, 0, 20, "127.0.0.1", true) && ret;
 	get_value(cfg, "gateway.icomPort", m_gateway.icomPort, 1U, 65535U, 20000U) && ret;
 	get_value(cfg, "gateway.latitude", m_gateway.latitude, -90.0, 90.0, 0.0) && ret;