fixes
StaticProgram improvements