Server bugs fixed