Some minor adjustments to validation and .afignore file