Fix guest editions