fix system architecture issues