Add ports for mosh, and tidy