Fixed more regex bugs