Minor fixes in regular expressions generators