Fixes to regex