Fix: Fix RegExp errors