Fix server functionality