Changes to support cowboy upstream