#311, #313: Fix the file validator issues