Validation fixes
Close #26