Move server stuff
Small fixes