fixed few issues in serverside