Merge "Cleaning up some build configurations" into main