Validation & checklist fixes.