diff --git a/src/main.cpp b/src/main.cpp
index 62422f2..e7e4065 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -77,8 +77,8 @@ void setup() {
 
   boot_count++;
 
-  static wifi_country_t wifi_country = {.cc="EU", .schan=1, .nchan=13, .policy=WIFI_COUNTRY_POLICY_AUTO};
-  esp_wifi_set_country(&wifi_country);
+//  static wifi_country_t wifi_country = {.cc="EU", .schan=1, .nchan=13, .policy=WIFI_COUNTRY_POLICY_AUTO};
+//  esp_wifi_set_country(&wifi_country);
   //Initialize Basecamp
   iot.begin();
 
@@ -126,8 +126,11 @@ void setup() {
   strftime(strftime_buf, sizeof(strftime_buf), "%c", &timeinfo);
   Serial.print("Current time: "); Serial.println(strftime_buf);
 
+  bme280.begin();
+  bme280.printValues();
+
   if (wakeup_reason == ESP_SLEEP_WAKEUP_TIMER) {
-    for (int i=0; i<5 && iot.wifi.status() != WL_CONNECTED; i++) delay(500);
+    for (int i=0; i<15 && iot.wifi.status() != WL_CONNECTED; i++) delay(500);
     if (iot.wifi.status() == WL_CONNECTED) transmitStatus();
 
     double seconds = difftime(now, mktime(&alarmTime));
@@ -146,9 +149,6 @@ void setup() {
   menuChange = eMainScreen;
   u8g2.setContrast(127);
 
-  bme280.begin();
-  bme280.printValues();
-
   //Set up the Callbacks for the MQTT instance. Refer to the Async MQTT Client documentation
   // TODO: We should do this actually _before_ connecting the mqtt client...
   iot.mqtt.onConnect(onMqttConnect);