Small static fixes