Small fixes for uptime()