update a couple places for swig based on @larzconwell's comments