Validation, parsing and a UI helper fix