Small static changes