Fixed the Validation bugs.