diff --git a/include/adevs_simulator.h b/include/adevs_simulator.h

index aa2f442..ed6e53e 100644

--- a/include/adevs_simulator.h

+++ b/include/adevs_simulator.h

@@ -617,7 +617,7 @@ void Simulator<X,T>::exec_event(Atomic<X,T>* model, bool internal, T t)

 		model->delta_ext(t-model->tL,*(model->x));

 	}

 	// Notify any listeners

-	notify_state_listeners(model,t);

+	this->notify_state_listeners(model,t);

 	// Check for a model transition

 	if (model->model_transition() && model->getParent() != NULL)

 	{

diff --git a/include/adevs_time.h b/include/adevs_time.h

index 76111ac..061351b 100644

--- a/include/adevs_time.h

+++ b/include/adevs_time.h

@@ -47,7 +47,7 @@ template<class T = double> struct Time

 	/// Value for infinity

 	static adevs::Time<T> Inf() { return Time<T>(adevs_inf<T>(),0); }

 	/// Constructor. Default time is (0,0).

-	Time(T t = 0, unsigned int c = 0):t(t),c(c){}

+	Time(T t = adevs_zero<T>(), unsigned int c = 0):t(t),c(c){}

 	/// Copy constructor

 	Time(const Time& t2):t(t2.t),c(t2.c){}

 	/// Assignment operator

diff --git a/test/alt_time_tests.cpp b/test/alt_time_tests.cpp

index 2409adb..0d0e553 100644

--- a/test/alt_time_tests.cpp

+++ b/test/alt_time_tests.cpp

@@ -80,10 +80,10 @@ Model<T>::Model():

 	a(new PingPong<T>(true)),

 	b(new PingPong<T>())

 {

-	add(a);

-	add(b);

-	couple(a,b);

-	couple(b,a);

+	this->add(a);

+	this->add(b);

+	this->couple(a,b);

+	this->couple(b,a);

 }

 // Non-standard type for time

 class TimeType