fix up a ton more Thorax port related issues