Tweak timestamp extraction