Couple of regex additions to procedure keys