Clean up a couple other port/files issues.