Fix for validations and view