Fix SoftwareManager