Passes Distro Check: Enhancements + Fixes