Fix mistakes of previous commits + timestamp = long