further fixes to maintain_901