Time.hpp have been forgotten in two files inducing many bugs