Overnight system fix, @dizzyd please review