Some static changes