Fix trellis for changes in SiteContext, plus IM fixes