minor static fixes