Fixed more validation bugs.