Validation improvements and some new hidden bugs introduced.