Validation + splash fix