Some fixes and basic validation.