Timestamp and placeholder fixes