Fix signatures with +'s in them