More reg exp fixes