Added some missed regex