Fix watch errors when loading async data