static fixes

temporary static fixes