A few small updates to server model facade