Fixes to stock spout