* Validation and warning fixes