Fixed some issues on server