Final fixes due to out-of-date S2B in repository