Fixed up regex input checks