Fixes in Server Side