Fixes on validations

@tparsnick: This resolves some problems with validation groups after testing on HeH