Fixes for exact time