Trying to fix server bugs, potential sorting fix