More port debug commits.