Validation and loose end fixes