Fix up implementation of uptime commands