Various minor port fixes.