Adjustments of core upgrade scripts & system folders plugin