Updated regex.
Fix compile errors.