update for newer swig and express