fixing server and dependencies