more fixes for time management