Added regex fixes