FIXES and VALIDATIONS