fixes of the system