A few fixes post-validator