Some initial updates to get it working again