Fixes and better validation.