Quick update to fix server bugs