more static fixes