diff --git a/lib/obp60task/GwOBP60Task.cpp b/lib/obp60task/GwOBP60Task.cpp
index bc1c977..9497ceb 100644
--- a/lib/obp60task/GwOBP60Task.cpp
+++ b/lib/obp60task/GwOBP60Task.cpp
@@ -231,8 +231,8 @@ void OBP60Task(void *param){
 
     // Initializing all necessary boat data
     GwApi::BoatValue *sog=new GwApi::BoatValue(F("SOG"));
-    GwApi::BoatValue *date=new GwApi::BoatValue(F("DaysSince1970"));
-    GwApi::BoatValue *time=new GwApi::BoatValue(F("SecondsSinceMidnight"));
+    GwApi::BoatValue *date=new GwApi::BoatValue(F("GpsDate"));
+    GwApi::BoatValue *time=new GwApi::BoatValue(F("GpsTime"));
     GwApi::BoatValue *longitude=new GwApi::BoatValue(F("Longitude"));
     GwApi::BoatValue *latitude=new GwApi::BoatValue(F("Latitude"));
     GwApi::BoatValue *waterdepth=new GwApi::BoatValue(F("WaterDepth"));
diff --git a/tools/flashtool.exe b/tools/flashtool.exe
deleted file mode 100644
index 0ff9ce0..0000000
Binary files a/tools/flashtool.exe and /dev/null differ