Tighten up some of the swagger models