Server improvements & fixes