Some changes to appease the validator