Fixed two glaring server bugs