Fixed up some ports.