Fixing loading and validation.