Move ProgramItem further fixes