Fixing bugs in server mesh expansion code