More Cowboy fixes