Fixes some regex for parameterizing