Fixing general 2am dopiness