Static fixes