Small changes related to fetching initial data