Fix static root issues