Sourth finding fixes