Merge "Clean up some build warnings" into main