Change the default loading; fix validation failures