fixes to  in static