One last commit that wraps up any changes I forgot across the whole source tree