More bug fixes with validators