Fixes and Validations