Minor server side changes