Fix start and server