Spout side fixes