Minor validation related refactoring bugs