Attempting to fix validator errors