changes to match the serverbase repo