Fix things to enable server