Fix breaks due to Spout API churn....