bugs fixes for timestamp (minor)