Fixed bugs/validations