fix various issues related to major update