General post-port fixups

Merged Christopher Davis requested to merge wip/cdavis/post-port-cleanups into main

Merge request reports