More static fixes