diff --git a/Planner/String.h b/Planner/String.h
index 2db4de42..f6d6315e 100644
--- a/Planner/String.h
+++ b/Planner/String.h
@@ -75,16 +75,14 @@ public:
 		}
 	}
 
-	String(long s) {
-		String((long long)s);
-	}
+	String(long s) : String((long long)s) { }
 
 	String(long long s) {
 		length = 0;
 		body = new char[1];
 		body[0] = '\0';
 		if (s >= 0) {
-			long s_ = s;
+			long long s_ = s;
 			long size = 1;
 			while (s_ >= 10) {
 				s_ = s_ / 10;
diff --git a/Planner/Task.h b/Planner/Task.h
index c3882a92..196bd439 100644
--- a/Planner/Task.h
+++ b/Planner/Task.h
@@ -42,7 +42,7 @@ protected:
 	String workspace;	  
 	TaskState state;   
 public:
-   long start_time;
+   long long start_time;
 	String printState(){ 
 		switch(state){ 
 			case Inactive: 
@@ -152,8 +152,8 @@ public:
 			}else if (Utils::Exists(workspace+"/INTERRUPT")){ 
 				state=AbortedByUser;	 
 			} else {
-			    long now = Utils::getAbsoluteTime();
-			    long delta = now-start_time;
+			    long long now = Utils::getAbsoluteTime();
+				long long delta = now-start_time;
 			    if (maxtime<delta){
 			    	state=AbortedByTimeout;
 			    }