More changes for SC7 & latest version of glass