Fixes and input validation.