minor server side changes