Fix different type callers + allow validators on them