timestamp related fixes