static fixes