SystemInfo extension module fixes