Fix location of system data