Update for new scotty-fay
fix orphan warnings