Minor port fixes
small changes