Added modification-related fixes for timestamps.