- [FIX] a lot of fixes related to SystemInfo and so