- Fix device type check
- Fix uptime not always being cleaned