Interim - working on problems exposed by system tests