few more static changes