more cowboy fixes