Some fixes for the regex