Additional validations and some corrections