Trying to fix various problem with validator