additional static fixes