Fix a bug in default timestamp handling, typos