Fixes to some cowboy changes

Made changes directly on github and didn't completely review them
before saving.