Bug in uptime display, clean up