Fix more preg_match issues with [^0-9]* which should be [^0-9]
Fixes #2127